pull: Also fix misplaced remote name handling
authorColin Walters <walters@verbum.org>
Mon, 29 Jun 2015 15:20:41 +0000 (11:20 -0400)
committerColin Walters <walters@verbum.org>
Mon, 29 Jun 2015 15:20:41 +0000 (11:20 -0400)
We want to set the remote name only if we're operating on a remote
URL.

src/libostree/ostree-repo-pull.c

index ff5bd3bc7c2f383530c56f733a163851e661ab88..71469e9fbc643058feb812104c7469545966edfa 100644 (file)
@@ -1684,7 +1684,6 @@ ostree_repo_pull_with_options (OstreeRepo             *self,
 
   if (_ostree_repo_remote_name_is_file (remote_name_or_baseurl))
     {
-      pull_data->remote_name = g_strdup (remote_name_or_baseurl);
       /* For compatibility with pull-local, don't gpg verify local
        * pulls.
        */
@@ -1693,6 +1692,7 @@ ostree_repo_pull_with_options (OstreeRepo             *self,
     }
   else
     {
+      pull_data->remote_name = g_strdup (remote_name_or_baseurl);
       if (!ostree_repo_remote_get_gpg_verify (self, remote_name_or_baseurl,
                                               &pull_data->gpg_verify, error))
         goto out;